Add rest of Ron's arcdist filter.

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index 861f7351768331e35a55eadd5db7627d74c639ef..89d1579a8b3b9e0aac40754585b137660f84ff68 100644 (file)
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -7,7 +7,7 @@ FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o \
        psp.o holux.o garmin.o tmpro.o tpg.o \
        xcsv.o gcdb.o tiger.o internal_styles.o easygps.o quovadis.o gpilots.o
 
-FILTERS=position.o duplicate.o
+FILTERS=position.o duplicate.o arcdist.o
 
 JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
        jeeps/gpsmath.o jeeps/gpsmem.o  \

diff --git a/gpsbabel/filter_vecs.c b/gpsbabel/filter_vecs.c
index 6b57e405164eece69e7b7190bce49b655e809768..e394df28471fe2d3b4272752243829469c58dd49 100644 (file)
--- a/gpsbabel/filter_vecs.c
+++ b/gpsbabel/filter_vecs.c
@@ -31,6 +31,7 @@ typedef struct {
 extern filter_vecs_t position_vecs;
 extern filter_vecs_t radius_vecs;
 extern filter_vecs_t duplicate_vecs;
+extern filter_vecs_t arcdist_vecs;
 
 static
 fl_vecs_t filter_vec_list[] = {
@@ -48,7 +49,12 @@ fl_vecs_t filter_vec_list[] = {
                &duplicate_vecs, 
                "duplicate",
                "Remove Duplicates",
-       }, 
+       },
+        {
+               &arcdist_vecs,
+               "arc",
+               "Include Only Points Within Distance of Arc",
+       },
         {
                NULL,
                NULL,

diff --git a/gpsbabel/reference/arcdist_arc.txt b/gpsbabel/reference/arcdist_arc.txt
new file mode 100644 (file)
index 0000000..349fb54
--- /dev/null
+++ b/gpsbabel/reference/arcdist_arc.txt
@@ -0,0 +1,116 @@
+# from SA route version 7
+41.150064468   -85.166207433
+41.150064468   -85.165371895
+41.149034500   -85.165157318
+41.147832870   -85.164771080
+41.146631241   -85.164384842
+41.144270897   -85.163655281
+41.141953468   -85.162882805
+41.139550209   -85.162281990
+41.137833595   -85.161852837
+41.136546135   -85.161681175
+41.132812500   -85.160608292
+41.132340431   -85.160479546
+41.131739616   -85.160050392
+41.131138802   -85.159664154
+41.130237579   -85.158977509
+41.129765511   -85.158634186
+41.129636765   -85.158548355
+41.129379272   -85.158419609
+41.129207611   -85.158333778
+41.128950119   -85.158162117
+41.128821373   -85.158033371
+41.128478050   -85.157775879
+41.126074791   -85.155844688
+41.125044823   -85.154857635
+41.122341156   -85.152668953
+41.119766235   -85.150566101
+41.118135452   -85.149278641
+41.117362976   -85.148591995
+41.114530563   -85.146059990
+41.112856865   -85.144772530
+41.112256050   -85.144085884
+41.111955643   -85.143871307
+41.110539436   -85.142970085
+41.108264923   -85.141167641
+41.107234955   -85.140352249
+41.106162071   -85.139665604
+41.105132103   -85.138678551
+41.104745865   -85.138163567
+41.104145050   -85.138163567
+41.103029251   -85.138163567
+41.102042198   -85.138077736
+41.101140976   -85.138077736
+41.099338531   -85.137948990
+41.099038124   -85.137948990
+41.098566055   -85.137391090
+41.096849442   -85.136961937
+41.096334457   -85.136575699
+41.094231606   -85.135588646
+41.093759537   -85.134687424
+41.093158722   -85.134387016
+41.092128754   -85.134258270
+41.091527939   -85.134172440
+41.091141701   -85.134172440
+41.090455055   -85.134172440
+41.089339256   -85.134172440
+41.088523865   -85.134301186
+41.088137627   -85.134387016
+41.087751389   -85.134558678
+41.086850166   -85.135159492
+41.085863113   -85.135459900
+41.084446907   -85.135760307
+41.083846092   -85.135459900
+41.083159447   -85.135374069
+41.082558632   -85.135159492
+41.082043648   -85.135073662
+41.081056595   -85.134773254
+41.079940796   -85.134472847
+41.079039574   -85.134172440
+41.077966690   -85.133872032
+41.076936722   -85.133571625
+41.075863838   -85.133271217
+41.075134277   -85.132970810
+41.075134277   -85.133271217
+41.074147224   -85.133271217
+41.073632240   -85.133271217
+41.073160172   -85.133271217
+41.071443558   -85.133271217
+41.070327759   -85.133228302
+41.069641113   -85.133185387
+41.069340706   -85.133056641
+41.068739891   -85.133056641
+41.068353653   -85.133056641
+41.067967415   -85.133013725
+41.067452431   -85.132970810
+41.066765785   -85.132884979
+41.066336632   -85.132884979
+41.065864563   -85.132884979
+41.065349579   -85.132884979
+41.064362526   -85.132884979
+41.063246727   -85.132884979
+41.062345505   -85.132756233
+41.061229706   -85.132756233
+41.060628891   -85.132756233
+41.059641838   -85.132670403
+41.058654785   -85.132584572
+41.058139801   -85.132584572
+41.057753563   -85.132541656
+41.057066917   -85.132455826
+41.056551933   -85.132455826
+41.055951118   -85.132455826
+41.055564880   -85.132455826
+41.054663658   -85.132369995
+41.053762436   -85.132284164
+41.053247452   -85.132284164
+41.052260399   -85.132284164
+41.051745415   -85.132284164
+41.050758362   -85.132155418
+41.049942970   -85.132069588
+41.049127579   -85.132069588
+41.047539711   -85.131983757
+41.046037674   -85.131855011
+41.045737267   -85.131983757
+41.045050621   -85.133056641
+41.044921875   -85.133056641
+41.044343591   -85.132979512

diff --git a/gpsbabel/reference/arcdist_input.txt b/gpsbabel/reference/arcdist_input.txt
new file mode 100644 (file)
index 0000000..e3f3610
--- /dev/null
+++ b/gpsbabel/reference/arcdist_input.txt
@@ -0,0 +1,103 @@
+\r
+BEGIN SYMBOL\r
+41.14703, -85.11092, N.E.R.D. by Enos Shenk Unknown Cache (3/3)\r
+41.13940, -85.10142, Fallen Timbers by TeamMJ Traditional Cache (2/2)\r
+41.14415, -85.14415, Historic Iron Bridges by Genoist (1/2 of TeamSJ1) Locationless (Reverse) Cache (1/1)\r
+41.12890, -85.11163, Mastadon Trek 2 by Genoist and Dogvetusa Traditional Cache (2/2)\r
+41.16413, -85.14688, NYC Trail by VistaAL Traditional Cache (1/1.5)\r
+41.15900, -85.15418, Craftily Concealed Containers by Warm Fuzzies Multi-Cache (4/2)\r
+41.12210, -85.11097, Land of Lost Auto Parts by Genoist and The Zymurgist Traditional Cache (1/5)\r
+41.17732, -85.15117, The Farm by AParks1569 Traditional Cache (1.5/1.5)\r
+41.10757, -85.13087, Swonderful by Genoist and The Zymurgist Traditional Cache (2/5)\r
+41.12733, -85.06728, Dr. Mengerson I Preserve by Genoist Traditional Cache (2/2)\r
+41.10417, -85.15167, Clue by Warm Fuzzies Multi-Cache (3.5/2)\r
+41.10823, -85.16212, Son of Pez by Enos Shenk Traditional Cache (1.5/1.5)\r
+41.09278, -85.14073, Urbana #3: Dodgy Deals by Enos Shenk Traditional Cache (2.5/1.5)\r
+41.09258, -85.09258, Secret Squirrels by Enos Shenk & Panic! Unknown Cache (4/1)\r
+41.08748, -85.13762, A King's Ransom by Team ABC and The GeoStars Team Traditional Cache (1.5/1)\r
+41.08427, -85.13597, Urbana #4: The City She Loves Me by Enos Shenk & Athena Traditional Cache (3.5/2)\r
+41.08582, -85.07230, Caribbean Cache by Genoist and Dogvetusa Traditional Cache (3/2)\r
+41.08190, -85.17180, Earthling Vector Luna- 2nd Phase by Earthling and Heavenbound Traditional Cache (1/1.5)\r
+41.08400, -85.05387, Earthling Vector Sol by Earthling & Heavenbound Traditional Cache (1.5/1.5)\r
+41.20673, -85.03985, The Sarsaparilla Cache by Cashconnect Traditional Cache (2/1.5)\r
+41.06353, -85.13400, Sky High by Enos Shenk Virtual Cache (1/3)\r
+41.09880, -85.21725, We Support Our Troops by Genoist and The Zymurgist Traditional Cache (2/2.5)\r
+41.06950, -85.19750, Shortwave by Warm Fuzzies Unknown Cache (4/2.5)\r
+41.06255, -85.04757, Starfall by Enos Shenk Traditional Cache (2/2.5)\r
+41.07482, -85.01957, Fly Like an Eagle by Team SJ1 Traditional Cache (2/2)\r
+41.04714, -85.16617, Perfectly Perplexing Puzzles by Warm Fuzzies Multi-Cache (5/3.5)\r
+41.07197, -85.01863, Arrow Haven (2/4) by Genoist Traditional Cache (2/2.5)\r
+41.07183, -85.01850, Heat Death (3/4) by Genoist Traditional Cache (2/3)\r
+41.06827, -85.01655, Abbadon by Genoist Traditional Cache (1.5/4)\r
+41.01503, -85.13290, Earthling Vector Pluto by Earthling & Heavenbound Traditional Cache (1/1.5)\r
+41.26535, -84.98950, Outstanding In Its Field Cache by kwbach Traditional Cache (2/2)\r
+41.00470, -85.05742, Earthling Vector Perelandra by Earthling & Heavenbound Multi-Cache (4/1.5)\r
+41.04247, -85.27570, KWAANTINAKAANI by Northmill Jo-Jo Beans and E-Bone Letterbox Hybrid (2/1)\r
+41.01760, -85.25190, Earthling Vector Terra by Earthling & Heavenbound Traditional Cache (1.5/2.5)\r
+40.97610, -85.22277, 47520 Feet by kidCraZy Traditional Cache (1/1.5)\r
+41.35740, -85.05117, A.C.D. Cache by 1MARKYMARK1 Traditional Cache (2/2.5)\r
+41.03592, -84.80323, EV-Castor & Pollux by Starhenge Multi-Cache (1/1.5)\r
+41.30855, -84.82960, Earthling Vector Malacandra by Earthling and Heavenbound Traditional Cache (1/1.5)\r
+41.33727, -85.39282, One Lost Ten Found by The GeoStars Team and Team ABC Traditional Cache (3/5)\r
+41.33552, -85.40885, The Leprechaun's Pot of Gold by Pete and Maureen Traditional Cache (1/1)\r
+41.08543, -84.72823, Payne Train by rlong3 (Long Clan) Traditional Cache (1.5/1)\r
+41.44473, -85.24797, Straight Flush by The GeoStars Team and Team ABC Multi-Cache (4/5)\r
+40.89088, -85.47038, 'Clare' up There by Zig & Zag Traditional Cache (2/3)\r
+40.82507, -85.35552, Jeanette's Journey by kidCraZy Multi-Cache (2.5/1.5)\r
+40.84245, -85.42245, Pine Sol by Indiana Herring Traditional Cache (1.5/2)\r
+40.84662, -85.43382, Kil--So--Quah by Good Dog Traditional Cache (1.5/2)\r
+40.80862, -85.35608, Stuck in the middle by The Hoosier River Rats Traditional Cache (2/2.5)\r
+40.80768, -85.36637, Rock Creek  by The Hoosier River Rats Traditional Cache (2/2)\r
+40.87892, -85.50570, Sunken Treasure by Smokey and Family Traditional Cache (2/1)\r
+40.83560, -85.45415, Clue Two by geoprime Traditional Cache (2/3)\r
+41.53267, -84.94377, Robb Hidden Canyon by VM's Traditional Cache (2/3)\r
+41.53553, -84.93188, Fish Creek Trail by VM's Multi-Cache (3.5/1)\r
+40.87942, -85.54058, All Locked Up by Zig & Zag Traditional Cache (1/1)\r
+40.71773, -85.10702, OUABACHE CACHE by ZoneRanger Traditional Cache (1/1)\r
+41.34498, -85.68462, Wy-Tri Cache by capt zigzag & echoes Traditional Cache (2/2)\r
+41.54878, -85.45370, Delt Church Dino Cache by GeoStars Traditional Cache (1.5/2.5)\r
+41.56537, -85.46163, Clearspring Cache by capt zigzag & echoes Traditional Cache (1.5/1.5)\r
+41.56282, -85.46893, Ace-in-the-Hole by The GeoStars Team and Team ABC Multi-Cache (2/2)\r
+41.62350, -85.33873, Geocache by Maple Wood Nature Center Traditional Cache (1/1)\r
+41.20898, -84.45685, Aqueduct by coinhound Traditional Cache (2/1.5)\r
+41.66538, -85.17465, Gannon Cache by capt zigzag & echoes Traditional Cache (2/1.5)\r
+41.22390, -84.42585, 5 Mile Creek Access by coinhound Traditional Cache (1/1)\r
+40.76567, -85.59953, Missing Dental Work by Indiana Herring Traditional Cache (2/3.5)\r
+40.75487, -85.59022, Salamonie Reservoir Trail Cache by Indy Diver Traditional Cache (1/1.5)\r
+40.78918, -85.65105, Dead End Cache by JollyBGood Traditional Cache (1.5/1.5)\r
+41.34360, -84.44365, Oxbow lake  AKA ( wabit twacks) by coinhound Traditional Cache (1/1.5)\r
+40.81153, -85.68533, In 'Hominy' with nature by Zig & Zag Traditional Cache (1/2.5)\r
+40.80997, -85.68650, Myrna's Treasure by Myrna's Mountaineers Traditional Cache (2/1)\r
+40.82988, -85.70725, Just Hanging Around by Zig & Zag Traditional Cache (4.5/3.5)\r
+40.63288, -85.36448, 13 graves and A Ghost by RedNeck Tracking INC. Traditional Cache (1/1)\r
+40.61557, -84.94355, 1861 Covered Cache by RedNeck Tracking INC. Traditional Cache (2/1)\r
+40.61378, -84.94383, Trailsend 1860 by RedNeck Tracking INC. Traditional Cache (1/1)\r
+41.69980, -85.03385, Nature's Back Yard by Cat E Wampus Traditional Cache (2/1.5)\r
+41.69567, -85.30143, Center Field by therealmongo Traditional Cache (2/2.5)\r
+41.70473, -84.99397, Back to our Beloved Sport by Max's Pets with Birddog Traditional Cache (2/2)\r
+41.69323, -85.33213, Pigion River Cache by Bonnie & Clyde Traditional Cache (2.5/2)\r
+41.71252, -85.02377, Artesian by Good Dog Traditional Cache (1.5/1.5)\r
+41.71708, -85.02897, P.S.P. by The Wolfe Clan Traditional Cache (1/1.5)\r
+41.71720, -85.01957, Earthling Vector Mercury by Earthling & Heavenbound Traditional Cache (1.5/2)\r
+41.71535, -84.98552, Marsh Lake High Ground by VirtualMoore Traditional Cache (3/2)\r
+41.55555, -84.57783, Bible Park Stash by DwFlatP8 and Luckyfriend Traditional Cache (1.5/1.5)\r
+41.23113, -84.36397, Taylor Made by Team WolfPack Traditional Cache (1/1.5)\r
+41.71960, -84.96467, The Crane Waterfall by VM's Traditional Cache (2/2.5)\r
+40.63232, -85.47248, Serenity by Indiana and Marion Traditional Cache (1.5/1)\r
+41.24542, -84.35613, "Tanks" For The Memories by Team WolfPack Traditional Cache (1/1)\r
+41.29958, -84.36582, Lets Make A "Diehl" by Team WolfPack Traditional Cache (1/1)\r
+41.72573, -84.96353, 80/90 Westbound Cache by Good Dog Traditional Cache (1/1)\r
+41.28945, -84.35925, Confluence Cache by Team WolfPack Multi-Cache (2/1)\r
+41.71007, -85.37105, Lane Lake Cache by capt zigzag and echoes Traditional Cache (2/2)\r
+41.69660, -84.80602, tristate marker by Hillsdale Historical Society Virtual Cache (1/1)\r
+41.51000, -85.78042, School Daze by Lobo Valiente  Virtual Cache (1/1)\r
+41.55730, -84.50957, Cemetery Hill by DwFlatP8 and Luckyfriend Traditional Cache (1.5/1.5)\r
+40.53373, -85.14770, Balbec Cabin Keychains by RedNeck Tracking INC. Traditional Cache (1/1)\r
+40.93718, -84.33907, Big Green by tex4711 Traditional Cache (1.5/1)\r
+41.38972, -85.89556, Island Cache by Bonnie & Clyde Traditional Cache (1.5/1)\r
+41.69122, -84.67567, glacial trailing by Mark Robinette Traditional Cache (2.5/2)\r
+40.51967, -84.98795, Liberty Cache by RedNeck Tracking INC. Traditional Cache (1/1)\r
+41.51870, -85.81747, Five Medals by kam Traditional Cache (2/2)\r
+41.01977, -84.28587, The Book Worm by Team Ace Traditional Cache (1/1)\r
+41.29335, -84.28538, Bushwacker by Panther2 Traditional Cache (2/3)\r
+END\r

diff --git a/gpsbabel/reference/arcdist_output.txt b/gpsbabel/reference/arcdist_output.txt
new file mode 100644 (file)
index 0000000..693773c
--- /dev/null
+++ b/gpsbabel/reference/arcdist_output.txt
@@ -0,0 +1,11 @@
+BEGIN SYMBOL
+41.14415, -85.14415, Historic Iron Bridges by Genoist (1/2 of TeamSJ1) Locationless (Reverse) Cache (1/1)
+41.15900, -85.15418, Craftily Concealed Containers by Warm Fuzzies Multi-Cache (4/2)
+41.10757, -85.13087, Swonderful by Genoist and The Zymurgist Traditional Cache (2/5)
+41.10417, -85.15167, Clue by Warm Fuzzies Multi-Cache (3.5/2)
+41.10823, -85.16212, Son of Pez by Enos Shenk Traditional Cache (1.5/1.5)
+41.09278, -85.14073, Urbana #3: Dodgy Deals by Enos Shenk Traditional Cache (2.5/1.5)
+41.08748, -85.13762, A King's Ransom by Team ABC and The GeoStars Team Traditional Cache (1.5/1)
+41.08427, -85.13597, Urbana #4: The City She Loves Me by Enos Shenk & Athena Traditional Cache (3.5/2)
+41.06353, -85.13400, Sky High by Enos Shenk Virtual Cache (1/3)
+END